Merge remote-tracking branch 'origin/master' into feature/android

diff --cc doc/lispref/commands.texi
Simple merge

diff --cc doc/lispref/display.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge